From: James Almer <jamrial@gmail.com>
Date: Fri, 29 Jul 2022 21:05:51 +0000 (-0300)
Subject: avcodec/alac: don't fail if channels aren't set during init() when extradata is valid
X-Git-Tag: archive/raspbian/7%8.1-3+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/success//%22mailto:kde%40ewsoftware.de/%22/%22http:/www.example.com/cgi/success/%22mailto:kde%40ewsoftware.de/%22?a=commitdiff_plain;h=9408d6b421da91383b87bb42670b133ba32552ba;p=ffmpeg.git

avcodec/alac: don't fail if channels aren't set during init() when extradata is valid

The decoder is meant to use it as a fallback if the value in extradata is
invalid.

Regression since d199099be.

Signed-off-by: James Almer <jamrial@gmail.com>

Gbp-Pq: Name 0003-avcodec-alac-don-t-fail-if-channels-aren-t-set-durin.patch
---

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 9aaf7066..4aab82d6 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -574,13 +574,15 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
     avctx->bits_per_raw_sample = alac->sample_size;
     avctx->sample_rate         = alac->sample_rate;
 
-    if (alac->channels < 1 || alac->channels > ALAC_MAX_CHANNELS) {
+    if (alac->channels < 1) {
         av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n");
+        if (avctx->ch_layout.nb_channels < 1)
+            return AVERROR(EINVAL);
         alac->channels = avctx->ch_layout.nb_channels;
     }
-    if (avctx->ch_layout.nb_channels > ALAC_MAX_CHANNELS || avctx->ch_layout.nb_channels <= 0 ) {
+    if (alac->channels > ALAC_MAX_CHANNELS) {
         avpriv_report_missing_feature(avctx, "Channel count %d",
-                                      avctx->ch_layout.nb_channels);
+                                      alac->channels);
         return AVERROR_PATCHWELCOME;
     }
     av_channel_layout_uninit(&avctx->ch_layout);